Protect getc_unlocked() by HAVE_FLOCKFILE in all cases. (#134205, Julio M.

Fri Feb 13 01:06:08 2004  Matthias Clasen  <maclas@gmx.de>

	* demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by
	HAVE_FLOCKFILE in all cases.  (#134205, Julio M. Merino Vidal)

diff --git a/ChangeLog b/ChangeLog
index 257202a37c0e7d4e61c935e8c4a5a41a460d23d0..7636211d628acfa89d43b8c9d7cab4247c13a724 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 01:06:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by 
+       HAVE_FLOCKFILE in all cases.  (#134205, Julio M. Merino Vidal)
+
 Fri Feb 13 00:54:59 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #104811, Padraig O'Briain:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 257202a37c0e7d4e61c935e8c4a5a41a460d23d0..7636211d628acfa89d43b8c9d7cab4247c13a724 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Feb 13 01:06:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by 
+       HAVE_FLOCKFILE in all cases.  (#134205, Julio M. Merino Vidal)
+
 Fri Feb 13 00:54:59 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #104811, Padraig O'Briain:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 257202a37c0e7d4e61c935e8c4a5a41a460d23d0..7636211d628acfa89d43b8c9d7cab4247c13a724 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Feb 13 01:06:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by 
+       HAVE_FLOCKFILE in all cases.  (#134205, Julio M. Merino Vidal)
+
 Fri Feb 13 00:54:59 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #104811, Padraig O'Briain:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 257202a37c0e7d4e61c935e8c4a5a41a460d23d0..7636211d628acfa89d43b8c9d7cab4247c13a724 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Feb 13 01:06:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by 
+       HAVE_FLOCKFILE in all cases.  (#134205, Julio M. Merino Vidal)
+
 Fri Feb 13 00:54:59 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #104811, Padraig O'Briain:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 257202a37c0e7d4e61c935e8c4a5a41a460d23d0..7636211d628acfa89d43b8c9d7cab4247c13a724 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Feb 13 01:06:08 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by 
+       HAVE_FLOCKFILE in all cases.  (#134205, Julio M. Merino Vidal)
+
 Fri Feb 13 00:54:59 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #104811, Padraig O'Briain:

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index f6510acdbc5dcbf2fff24618f2ecdbf0f69cf3b3..fb2e7a5b22b0e35e6b887ba15410bf1d6df9a138 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -122,7 +122,7 @@ read_line (FILE *stream, GString *str)
     {
       int c;
       
-#ifndef G_OS_WIN32
+#ifndef HAVE_FLOCKFILE
       c = getc_unlocked (stream);
 #else
       c = getc (stream);